Skip to content

Adapting to jenkinsci/jenkins#7028#135

Merged
pjdarton merged 1 commit intojenkinsci:masterfrom
basil:log4j
Mar 22, 2023
Merged

Adapting to jenkinsci/jenkins#7028#135
pjdarton merged 1 commit intojenkinsci:masterfrom
basil:log4j

Conversation

@basil
Copy link
Copy Markdown
Member

@basil basil commented Mar 21, 2023

As of jenkinsci/jenkins#7028 Jenkins core no longer has a managed, provided dependency on Log4j 1.x, but it delivers the same classes on the runtime classpath via log4j-over-slf4j. As such, this PR is needed to ensure that this plugin does not start bundling Log4j 1.x when its baseline is upgraded to one that includes jenkinsci/jenkins#7028. (Bundling Log4j 1.x would not be disastrous, but the plugin's copy would not be used because core's copy would take precedence.)

CC @pjdarton

@pjdarton pjdarton merged commit fb8885f into jenkinsci:master Mar 22, 2023
@basil basil deleted the log4j branch March 22, 2023 19:04
MarkEWaite added a commit to jenkinsci/job-dsl-plugin that referenced this pull request Mar 23, 2026
MarkEWaite added a commit to jenkinsci/job-dsl-plugin that referenced this pull request Mar 23, 2026
…b_5068c (#2579)

* Bump org.jenkins-ci.plugins:vsphere-cloud

Bumps [org.jenkins-ci.plugins:vsphere-cloud](https://github.com/jenkinsci/vsphere-cloud-plugin) from 2.27 to 3.512.vfb_0824b_5068c.
- [Release notes](https://github.com/jenkinsci/vsphere-cloud-plugin/releases)
- [Changelog](https://github.com/jenkinsci/vsphere-cloud-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jenkinsci/vsphere-cloud-plugin/commits)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:vsphere-cloud
  dependency-version: 3.512.vfb_0824b_5068c
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Remove exclusion of log4j

jenkinsci/vsphere-cloud-plugin#135

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants